Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remote-ssh: fix Node not patching automatically #163797

Closed
wants to merge 5 commits into from
Closed

remote-ssh: fix Node not patching automatically #163797

wants to merge 5 commits into from

Conversation

Enzime
Copy link
Member

@Enzime Enzime commented Mar 12, 2022

Description of changes

The code in #76202 has since stopped working due to extension.js changing. I've changed the location of the code insertion to ensure it runs every time before attempting to start the remote server.

The code now tests if the VS Code Server's Node is working and the correct version before attempting to patch it. It will first attempt to build Node from Nixpkgs, if that fails, then it will fallback to the locally installed Node.

Fixes microsoft/vscode-remote-release#103 and microsoft/vscode-remote-release#648

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Enzime Enzime requested a review from jonringer as a code owner March 12, 2022 09:00
@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from 14509a4 to 42aa12d Compare March 12, 2022 09:04
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 12, 2022
@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch 2 times, most recently from ee572ff to c0cc2df Compare March 12, 2022 10:57
@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from c0cc2df to cc4b351 Compare March 13, 2022 07:47
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Mar 13, 2022
@Enzime
Copy link
Member Author

Enzime commented Mar 13, 2022

Added tests to ensure that Remote SSH works 😄

@ofborg ofborg bot requested a review from SuperSandro2000 March 13, 2022 08:01
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Mar 13, 2022
@Enzime
Copy link
Member Author

Enzime commented Mar 13, 2022

@ofborg test vscode-remote-ssh

@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from cc4b351 to d2f90de Compare March 13, 2022 09:48
@Enzime
Copy link
Member Author

Enzime commented Mar 13, 2022

@ofborg test vscode-remote-ssh

@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from d2f90de to b6dfcbc Compare March 13, 2022 10:39
@Enzime
Copy link
Member Author

Enzime commented Mar 13, 2022

@ofborg test vscode-remote-ssh

@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from b6dfcbc to 088eb10 Compare March 13, 2022 13:32
@Enzime
Copy link
Member Author

Enzime commented Mar 13, 2022

@ofborg test vscode-remote-ssh

@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch 3 times, most recently from ccaacf1 to 41e14c8 Compare March 26, 2022 05:46
@Enzime
Copy link
Member Author

Enzime commented Mar 26, 2022

@ofborg test vscode-remote-ssh

@Enzime
Copy link
Member Author

Enzime commented Mar 26, 2022 •
edited
Loading

@ofborg eval

@SuperSandro2000
Copy link
Member

You can edit old comments and add a space to retrigger ofborg.

@Enzime
Copy link
Member Author

Enzime commented Mar 26, 2022 •
edited by SuperSandro2000
Loading

@ofborg eval

@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from 41e14c8 to c0a93c7 Compare March 26, 2022 23:10
@Enzime Enzime force-pushed the vsce/remote-ssh-fix-patching-node branch from c0a93c7 to b1a0638 Compare March 27, 2022 03:18
@Enzime Enzime closed this Sep 20, 2022
@Enzime Enzime deleted the vsce/remote-ssh-fix-patching-node branch December 25, 2022 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

@tbenst tbenst Awaiting requested review from tbenst

@figsoda figsoda Awaiting requested review from figsoda

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@aanderse aanderse Awaiting requested review from aanderse

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: vscode 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
3 participants
@Enzime @SuperSandro2000 @superherointj